From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 19 Sep 2011 18:06:14 +0000 (-0400)
Subject: * lisp/whitespace.el (whitespace-newline-mode): Disable it right.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2205
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eb90b1b862395b350818bc588952d4beb54da8d5;p=emacs.git

* lisp/whitespace.el (whitespace-newline-mode): Disable it right.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b3bdd8e9e9..99bd8c058b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* whitespace.el (whitespace-newline-mode): Disable it right (bug#9550).
+
 2011-09-19  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 89f078a5063..e0bc74343d2 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1105,8 +1105,8 @@ See also `whitespace-newline' and `whitespace-display-mappings'."
   :global     nil
   :group      'whitespace
   (let ((whitespace-style '(face newline-mark newline)))
-    (whitespace-mode whitespace-newline-mode)
-    ;; sync states (running a batch job)
+    (whitespace-mode (if whitespace-newline-mode 1 -1))
+    ;; Sync states (running a batch job).
     (setq whitespace-newline-mode whitespace-mode)))